Added in 6,11,12 queries