Commit before refactoring waterfall.