This also probably wants .values_with_halo