some structural updates.