Some touchscreen changes adopted