o Little function re-arrangement.
o re-add accidentally removed -q flag.