made more changes to the structure