added filering capabilities