commit before major overhaul