Converted to more user friendly shell interface