Added mochi and changed some things