more work on 10.1.2