More changes to analysis.