Diag corrected and ready for tests