changes to yuo and stuff