Delegate output to new class
Remove buffer use