Ruitong

merge Edward's changed