more skip logic changes