Safer credentials; Running on full dataset