Added support for passing program in via command line again