update based on nakamura-san's feedback