back come energy updates
Merge remote-tracking branch 'origin/intro' into intro

* origin/intro:
  Additional Copy Added