ArcTouch code review

Pull request for ArcTouch code review