Added more copy changes