simplified it and removed false positives