event announce logic changed