Changed from loose to table output