Further rework of code.