Refactoring.
Merge branch 'rearch'