Pupet and scrapleft update