Replaced filters + refactor