added Lu's change (filtering)