Some code change by weibo