Michael, I had to temporarily undo one of your changes to structs. I will put it back later once I get my part compatible with it