Working on the structure more