Added code for easier command line debugging