Adding better touch control