including control of energy storage means