Fix calculations and add the SAGR model