Filtering Mechanism

Added flag mechanism to to help Nathan