Moar porting to XO file (hopfully works now)