calculator with final changes