Slightly improved pathing