Changes Ken Kawamoto made for R2 release