Change structure and add some stuff.