WIP on default consolidation