some more work on 15.2