* some structural changes