re-organized events management