More progress on refactoring expenses for subgroups.