Collision logic updated