Made some structural changes