Updated q7 version