Revised to use DBA database tables