WIP pathing changes