more work on Adap-HH