Added calculator solution