after refactoring in the temporary 'sprmanalysis-3' repo