Updated for both analyzers