change skip logic