updated changes to calculator