Updated shell setup