follow-up to changes in data structures