(master) adjusted resolve route