Updated for 2009 database