added stuff to get noj