Updated to accommodate refactoring.