adding command line support back in