Changes for touchscreen