Changes in d2rq, almost finished