Various changes + conclusion