#19 - Fix output windows, better performance optimalization