NLC added elsewhere; still TODO's