commit before major simplifications