Added "format output" option