exchanges q for tillthen

much less code, see --stat :P