Updated for 2006 database