copy changes as per Melinda