merged with Fujisawa-san 's code