Cleaned up collision detection in level 3