Fixed scattering. Still ugly code.