Changes according to Koi's comments.