Changed: improved collision detection massively