updated structs