A bit more consolidation