Reworked collision detection system