Added mouse/finger control