added non-consolidation handling