Bit of advice needed on tank replacement