changes for TS version