finalized a couple more queries