Output format improved