add jing's code