Revamping my mocchi