Updated to current script versions