Removing the changes of the prev commit (some of them) and adding some new stuffs