Added energy base (not done)