need to update the `$raw_key` as well