Updates for 3.1