Fixed part1 (implemented populating the database)