updating old copy
merged