updated data filtering
updated data filtering