Residential Factor Calculation Revised 20190612