Slightly improved scatter mode. Still WIP