Updated for latest TS update.