Should now be called each time data is deleted or added as well as each time a new enumeration is started.