yong's change on branch 123

looks good