Reworked collisions. Again.