Adopt DriftGuard