Changes for more touch friendliness