finished data structure upgrade