added Calculator class