Move logic around in AnnouncementBuilder