Changed points to structs