Made overlap avoidance more effective