Updated to new script