More robust pathing