fixed -r. added -s