updating for 3.2 (incomplete)