added Query 7 and 8