refactorizing continues: pickups are a problem