The 30Ai "upgrade" is free, but I do worry the pipework will be an issue. For the 25Si, the installers toyed with the option of running pipes around the house, then had another look under the kitchen cupboards and decided only few smaller pipes need to be replaced. I wonder how much more...