Add Zejun's code