Change output calculation to be more in line with new EnergyNet behaviour