Fix collisions in the feat/improve-collision-detection branch.
Fix collisions in the feat/improve-collision-detection branch.