added -s and -u options