Update notify call and client locking