move from audit to TS