Merge Arif & Jianfeng Code