Changing the logic of PickupForm.