updates form neil and  Chaohai