minor changes in event parsing scheme