More updates to the scripts