May be possible to use an old calor bottle for a tank to solve flow issues.