Made announcements more flexible