Adding q3 and q5 uncompleted though