3.5 version datastructure to 3.6