Modified to better detection of DSS related items