Moved scatter to module