Phase2 hgx20

Correction on top of Lindsay's correction