Correlations removed, refactored ids