Mainly moved Tyler’s query into another section