nkb: updates for staging