updated to use new method in entity event