Added shell filtering