made xiangruis suggested changes