Added functionality to calc