More refactoring ...
Merge branch 'merging'