merging Jozo's changeFilter

merged