Improved Script