Now sleeps on sweep. some refactors