improved shell behavior
improved shell behavior