Phase2 hgx5

I dont see why they cannot be merged automatically