Adding more scripts
Merging in upstream changes