some changes for breaks
Merge branch 'Lu-Tao'