Rearranged object structure, should be no visible changes