various changes to accomodate nki_enhanced