Calculation func added