Upgraded analyzer