A lot of bug fixes to announce request
Announce request tested and working