more work on energy stuff