change way actions are handled in events