skip mode refactored