Added full energy calculation
Merge branch 'full-energy'