fixed the picking stuff