Updates for R-3.1