adding filtering
merge complete