testing filter
fixed merge conflicts