correction for new and old script
Merge origin/master