Consolidate even more