Changes to list pup to enable pupping of only necessary things