added more to structs