Modified how to handle command line args