Changed logic on some collisions, left a TODO