further updates to structure