Work on diagnostics: t+