Turn collision detection system into a proper system