Redoing collisions (not working perfectly yet)