updated eventParser