Issue 826 - awesome energy changes