wip: fixed scattering