Matfield Green Water System Improvements