Limit events

Being a stickler for detail here: this should be its own patch