Midterm Final Update Part 1: Fixed Collisions