yaya-machine modified