made some structural changes