refactored skips