height checking
Merge branch 'NewBranch'
building