Move notify out