New version of pickups

Note: Old version still needs to be removed