Updated to reflect custom event changes.