reverted back a bit but added the touchend events