updating with 3.1 changes