Added filter
Fixed merge conflict