Added WIP code for Com HP