Now has scattering and proper DM delays