Finding the last few rivets