Work on scripts
Improved script