Changed the way the filter system works