Adjust structs
Use newly adjusted struct