progress on filtering
better filtering