draft of more liberal filter
merge conflicts