Reverted the collision handling to the old one
Implemented new animations