small changes to pick system