new changes - pickups and dependencies - fixed