removed "clear" and added "keys"
merged