added TS modifications