updated eventfilter