pull the newchange to msdc

update for the new sample code