NICLC, etc. now saved as ints