Some changes according to Masao's comments