Remove assumption, add announcements