change to structs part 1