This is part of the last refactor.