Reworked the Filter stuff