Implemented new collision detection system