Buffers, heat pumps, additional heaters