Bad commit, a lot of changes