Finished adding new command line params. Not tested.