added @shell support