More energy changes

Reducing the energy use.