Close announcement functionality

I think this is simpler solution really and regex is just a bit messy.