Now uses command line arguments