more work on 2.10 build