Added Q7 with inner joins