Re-routed command line arguments to match design in issue #3