Added more touchability