Find events update (PR 107)