Gave Showroom Shine a try after a recommendation.
Have not been disappointed. Also used the glass cleaner , also very good and impressed with results.
Give them a try , particularly when there are water shortages around the corner.