Updated to touch-2.3.0