Water Spots On Glass - SOLVED

As others have suggested ( clay bar ), Works great for me...

Dave,
I did clay bar my windshield - it's new with no water spots - and YES, it is awesome!
But no effect on the water spotted glass...

Jeff