Made the end event backwards compatible