Merged the two analyzers