Second version of calculator