[WIP] use new event payload format

else raise?