Address comments from Kato-san