Revised output format