changes for of74
changes to fit current of event system