updates by Jing
changes by jing
changes by jing