Updated commandline version