big change to calculator functions