updated simple calculator