more work for 3.1.0