#1 updated for CLI