POC - replace old key with new