touching up the switch to keys-for-userid