Add checks for remaining end events