Add more redundancy checking.