Merged Jing's updated comments