Updated to work with Ti v3.X