small updates to work with structure

asdasd