onAdd, onLeave now work