Updated q version