Finish the 1st version of Analyzer