Added commandline versions