Residential Factor Calculation Revised 20170701