Added calculator assignment