Changed spot check logic