add the new CLI system