Beginning in 2014, MRMS has been successfully transferred to operations at the National Weather Service’s National Centers for Environmental Prediction (NCEP), with MRMS products available in real time to NWS forecasters, National Centers as well as numerous customers and partners in the public and private sectors. Along with extensive use of MRMS products in warning and forecast operations, MRMS has also become a critical facet in a number of analysis and forecast systems, including NCEP’s High Resolution Rapid Refresh (HRRR) and National Water Model (NWM) prediction systems. Because of MRMS’ crucial role in current and future weather and water services, NOAA has targeted a significant enhancement to MRMS over the next few years utilizing resources from the 2017 Disaster Supplemental Appropriations. This project will involve optimization of the underlying code and architecture of MRMS, enabling MRMS to optimally utilize future NOAA computing infrastructure. Additionally, new tools will be developed for MRMS to enable NWS hydrometeorologists to more easily quality control QPE for NOAA’s hydrologic models. This presentation will provide an overview of the plan and ultimate deliverable for this project, as well as the most recent plans for how MRMS will support key initiatives such as Warn-on-Forecast and FACETs and meet NWS requirements and broader community needs.