add -s option, not 100% ready