Use new questor & simplify