improved shell support