re-structure events for contribute-2