Improved Collect-to-Wall maneuvers