Changes to Jae Hee's branch

Changes to Jae Hee's branch