overhaul of CLI