new segment control
Merge branch 'newclassbranch'