Rewriting the subscriber and notifier a bit to work with the moved out storage