Feature/optimising halos