flesh out filtering more