update to events and models