[READY to merge] Add conditions to announcement display