re-arranged pathing