The Cascadia Conservation District partnered with the Jones-Shotwell Ditch Board to modernize the Ditch Board's diversion facilities to comply with NOAA Fisheries criteria, improved fish passage, and enhanced the habitat for threatened and endangered salmonid species at their diversion site in Monitor, WA. The old diversion features consisted of a rock wingdam, a 600-foot-long man-made diversion channel, a traveling belt screen, and a forebay water surface control check structure. This project replaced the rock wingdam with a permanent rock structure allowing the district to divert water without having to rebuild its instream diversion annually. The diversion channel was reworked, including removal of some concrete structures and adding habitat elements, which eliminated the need to periodically excavate the channel to remove the continuously deposited sand and silts. These actions improved valuable salmonid habitat. The old fish screens were at the end of their useful life and did not comply with the current NOAA Fisheries juvenile passage and protection criteria. Their replacement prevented entrainment and impingement of juvenile salmonids, which is critical considering the habitat value that WDFW places on the diversion channel. The forebay structure was a passage barrier to adult salmon attempting to enter the diversion channel from the downstream end. Building passage over the structure allowed downstream access to the diversion channel. WDFW requested upstream passage for salmonids at this forebay check structure.