Update from Ryo4.