added command line switches for testing purposes