Finish iHs integration
Finish iHs integration