More work on EventFinder