This was nice, and these were my changes (Taro).