Adding in safety filter