Calculator class changed