updated script
merged