changes up to 19_Aug