first CJI commit, seems stable but do not scale for more keys