Updated from Kato's feedback