minor editing
experimental merging