lots of changes, filter still works