#113 rearrangement of the structure to improve alignment of data