Updating to latest v1 TS