Updated for 3.2