Updated for 2011 database