Add old scripts
Pull in upstream changes