Nadiag2.0

@Nadiag2.0