Touchscreen Updates from 3.0.8