complete redo of attempted CLI