Improved scripts
Improved scripts