Updated command-line version