Tango: More progress with folding