Add Q7 and Q8