Made some structural changes.