Broken commit, changes in design