update the discovery stuff to be consistent and actually pass through