adding better skipping