updated for 3.2.x.GA