commit before major rewrite