Better announcement handling.