Use the discover2 database instead?