More Query Time Code to Move Over