Added some calc functionality