Improved the scripts.