Added calc-function