Touch & Go - added fields & smart tag