jun2013: forgotten update never committed
q: questionnaire
q: missed adding q.t