This is part of the "old" code.