Improved warp between Goldenfields and Mountain Watch