adding pickups group
Merge branch 'pickups'