Separate electricity and energy