Analyzer

Keep the analyzer not too far behind master