some structural updates