Changes to collision (still dodgy)