old changes
changes to main (new command line argument system)