Adding diagnostics to launch