Added ability to suppress certain output using more options