updated for _key changes