added some yamato stuff