I use the ONR also and have found that I can get a wonderful result using distilled water. Our water here in Arizona is very hard and leaves lots of scale behind otherwise.
I can wash the entre car with only one gallon of distilled water and it just shines!!!