BalajiN | #99 | Integrating diagnostics with TAMA