Modified code to reflect new database.