Upgraded tsapi.