Completed adequate announcement handling :)