Calculator updated & working