Fixing bugs + formula modification (with power idle subtraction)