Added code that makes command line option take effect