Replaced query7 and query8 from INT