20140310: updated to reflect change in database layout