Ready for refactoring.