rafactoring
rafactoring of energycontainer