added -s option and quieted code