Added queries, so that I can play with them
Is this faster?