Now works for keys
Manual merge