modify for hj