FINALLY FIXED COLLISION DETECTION!