Updates to filter system
Updated version