New values for pickup
Changed defined position
Various automomous changes.
Merge remote-tracking branch 'origin/master'