Updates to Filter Functions
Updates to Filter Functions