Updates for Ti3.2