Redefining Energy Calculation Macro