Changes to fix rq2