Refactored to use through2-filter