add options, defaulted to False, that will re-introduce bugs when set to True