Improved scripts