New formatting of output