Converted to calculor class