#6: daisy.dai's Jan 29 changes

Change request updated