Cleaned & added stim event criteria