small changes to C8Q6 and Q5