Shell improvement, but not work now