replaced shell wrapper with commander