,
merged change in orientation
added touch input