#360 better paths