Modified output to be more informative / accurate