Phase2 hcx1

Safer code