buckets and announcements changes, for now