Ajust TS for more mogical workflow