Issue #10 - speed up the output