Commit before rework