Some editing
Merge