Still some issues with skip logic