Heavy modification to bring up to speed with particle and fluxing changes.