upto StatementAnalyzer fixed