FIX - Collision logic