Committing before major overhaul