change model and events to use presentation