improve the output if we run this script on a non-clustered system - close #18