Updates to 3.1