More work on the energy system