Updated shell, input