Better handling of skips