Updating references to _skip