Modified structs so a ton of memory isn't being allocated