Update nextKeyValue() per conversation with Raghu