commit 7: more pickups