control point before merging
merged
Some changes in order and comments