Updated for 3.2.0