updated for all halos