changed order of notifications