A lot of changes to the structure