Commit before rewriting of engine