masaki's commit