More updates to scripts