add more sweep utilities
need to refactor this code