fix 3
fix X
fix HW
Merge branch 'TestBranch'

Conflicts:
	X.txt