make some structural changes