updated scripts to match the static ones
Merge remote-tracking branch 'origin/master'