added -s option