New version including #22.