Improved collision detection, thank you 4am eureka moment