Tweaked pickup logic