Improved shell

Improved shell