Added Energy system+ much fixing