Improved output slightly