Modified to reflect new database structure
Modified to reflect new database structure