Q5 and Q8

done