Re[2]: Move notifies around to match native