updates to code for structure
merge changes