added watt hour energy calculations