Merged with Jing's new commit