Correction to previous commit, added two new categories for event classification