Updating scripts per PS Team feedback.