tried to fix findMatches and saving events