April Calculation Updated