Updated Collision class