Update on Analyzer, almost done