Add Zero Tolerance System
Fix