Updated the scripts ahead of transfer to organization