We have 4 toilets in our house and we've been replacing awful 1st generation 1.6s with Totos. We've already installed two Soirees and they are great. One upstairs bath has a Drake. The Drake wasn't installed entirely properly and rocks a bit (yes, I'll get it fixed soon). My husband isn't as fond of the Drake and would prefer to put the Soiree in our Master bath. I had thought we might choose an eco-Drake for the Master. Is it possible to retrofit the regular Drake to be more water-wise? If so, I'd feel better about choosing the Soiree if we had at least one very low flow/dual flush model in the house. Is there another I should consider for this last bath?