Disabled the -x option globallly. only enabled in certain functions