added filtering
added filtering