added calculator mode