update to current om
move out handle-event