Mmachi's changes