Fixed and improved output