merge my changes with toshio