Calculator_Eff added