added pick_id to ntofication and notifications setup