More wip on spot check