These need updating to reflect the revised keys.