moved Njp to here.