slightly revised CLI