Added Q7 code
Merge