reworking the analysis system