More tweaking.
merge...