xyz
use new parameters for halo
cleaning up
whitespace