made changes to structure