Add skipping logic