fixed scripts
merged