Some more consolidation