Fixed goal issue. Resolved pick-up issue.