UPDATED: database.sql