Updated shell (functional)