Updates from TSI work