Added shell and speedup