Add back the Zero Tolerance Policy