added calculator versions