improved collision avoidance (also for table) (2)