sync with lothian:S2I2