updated and tested for 3.2.0 release