Added additional filtering