Updated Pathfinder intergrated with Tray