New filtering code based on harness testing