Refactoring. Tier0 is now just detection.