Improved the scripts!