Phase2 he22

Correct a few scenarios