Adding Yuxin's changes to the repository