More progress on updating to new format(s)