Making more changes to the Filters