Simplified skip logic