Second version of our calculator