upgrade to events system