added more copy changes