Structs

OSR corrections