move a couple of options out into relevant notifiers