First commit for SA/TG sweeps