Fund Calculation changes