fixed manipulators to work with changes to events