Modified the passing of command-line arguments