Adding final NDB stuff