Redo options to allow individual overrides