This should use the newer notification syntax.