Revert "Revert "Latest Changes for HH""

This reverts commit 7f627ca79b2e0c023727d42ac6454e34392fb07d.