Finish NKB2000 (reverted from commit fda789f00e4f1904d58736b302d204d0854cb85f)