Adjusted Collision Handling again