Continued on the refactoring.