New output.
Continuing with refactoring.