Bring both update scripts to feature parity