Updated to support touch only interfaces