Address view comments update to latest tc