Brought in line with private script.