Re-architecting changes