Merge Chris's script with the one already checked in