Minor modification to way command line arguments are passed