Changes asked by TI v1