Better logic for skipping