Puffers and Thermal Storages