Improved output and performance