newly rebuilt for R3.1