updated to function with EventedObject 2.2+