the check_for_samples now seem to work