moved sweeper into controller