code refactor - moved method touch support.