Updates for 3.2