Re-architecting stuff