Commit before another "re-design"