Changed the database concept, changed numbering slightly