added calculator class