Added calculator part 2