Change system to add touchMarker and touchHandle