Added some announcing logic