Improved Script
Improved Script