changes for own_keys. Working on that