rejiggered events to track more simply