changed ordering
if notification send None