Updated cli procedure