Add changes in last review request patch regarding copy thing