RE Refactoring: That should not hold up this PR.