final commit before major changes