Added raw filtering