added all the awesome discovery goodness