added additional filtering