Added calculator 1 and 2