updated for new keys